Skip to content

Fix process Stop timeout error handling#3523

Open
mattsu2020 wants to merge 1 commit into
kubernetes-sigs:mainfrom
mattsu2020:fix_3522
Open

Fix process Stop timeout error handling#3523
mattsu2020 wants to merge 1 commit into
kubernetes-sigs:mainfrom
mattsu2020:fix_3522

Conversation

@mattsu2020
Copy link
Copy Markdown

@mattsu2020 mattsu2020 commented May 21, 2026

What changed

  • Preserve the Stop timeout error when SIGKILL fails after StopTimeout expires.
  • Include the SIGKILL failure as supplementary error context with errors.Join.
  • Add a deterministic regression test for the timeout-plus-kill-failure path.

Why

On Darwin, SIGKILL can fail with EPERM if the process is already terminating after the timeout. That failure previously replaced the primary timeout error, making callers and tests see unable to kill process ... instead of timeout waiting for process ... to stop.

Fixes #3522.

Validation

go test ./pkg/internal/testing/process/
go test ./pkg/internal/testing/process/ -run TestStopReturnsTimeoutWhenKillAfterTimeoutFails -count=100

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 21, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented May 21, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mattsu2020
Once this PR has been reviewed and has the lgtm label, please assign joelanford for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 21, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented May 21, 2026

Hi @mattsu2020. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 21, 2026
@mattsu2020 mattsu2020 marked this pull request as ready for review May 21, 2026 23:01
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 21, 2026
@k8s-ci-robot k8s-ci-robot requested a review from vincepri May 21, 2026 23:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joelanford joelanford Awaiting requested review from joelanford

@troy0820 troy0820 Awaiting requested review from troy0820

@vincepri vincepri Awaiting requested review from vincepri

Assignees

No one assigned

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Stop() timeout error swallowed by SIGKILL EPERM on Darwin

2 participants

@mattsu2020 @k8s-ci-robot